Merged in changes.

Merged in changes.

If this doesn't work, I blame the NWO conspiracy.

I need to go put my tin foil hat back on now, and keep a lookout for the
black helicopters.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 6c9d9af0978552a0e67c2cd9fd1501ef5f8b0beb..3ca009a208d83a1474f4e4c0b54358ff19e763dd 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,11 @@
+2000-03-01  Mark Crichton  <crichton@gimp.org>
+
+       * configure.in: Added BUILD_CANVAS_ITEM stuff to (finally)
+       fix the last auto* build bug (where we have libart, but no
+       gnome-libs)
+
+       * gdk-pixbuf/Makefile.am: Same.
+
 2000-02-28  Matt Wilson  <msw@redhat.com>
 
        * gdk-pixbuf/gdk-pixbuf-drawable.c: s/unsigned long/guint32/g,

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 4a628fae8b5a8eb924ff6208bd9b380a3de1c762..9e34123b3ec7f01082d83bd941cf2b7295104fed 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -1,20 +1,20 @@
 SUBDIRS = pixops
 
-if INSIDE_GNOME_LIBS
-CANVAS_PIXBUF_LIB =
-CANVAS_PIXBUF_HEADERFILES =
-EXTRA_GNOME_LIBS =
-else
+if BUILD_CANVAS_ITEM
 CANVAS_PIXBUF_LIB = libgnomecanvaspixbuf.la
 CANVAS_PIXBUF_HEADERFILES=gnome-canvas-pixbuf.h
+libgnomecanvaspixbuf_la_SOURCES = gnome-canvas-pixbuf.c
 EXTRA_GNOME_LIBS = $(GNOME_LIBS)
+else
+CANVAS_PIXBUF_LIB =
+CANVAS_PIXBUF_HEADERFILES =
+EXTRA_GNOME_LIBS =
 endif
 
 lib_LTLIBRARIES =              \
        libgdk_pixbuf.la        \
        $(CANVAS_PIXBUF_LIB)
 
-libgnomecanvaspixbuf_la_SOURCES = gnome-canvas-pixbuf.c
 libgnomecanvaspixbuf_la_LDFLAGS = $(EXTRA_GNOME_LIBS)
 
 libexecdir = $(libdir)/gdk-pixbuf/loaders